From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 28 Oct 2008 10:35:15 +0000 (+0000)
Subject: xenoprof: Small fixes.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14054^2~21
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=df7542541e4e591e2b29a26a671b3e08b0965056;p=xen.git

xenoprof: Small fixes.

Signed-off-by: Ronghui Duan <ronghui.duan@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 3aa3fa7f2d..fb12efe46a 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -26,7 +26,6 @@
 #include <xen/domain_page.h>
 #include <xen/hypercall.h>
 #include <xen/perfc.h>
-#include <xen/xenoprof.h>
 #include <asm/current.h>
 #include <asm/io.h>
 #include <asm/regs.h>
@@ -50,6 +49,7 @@
 #include <asm/hvm/vpt.h>
 #include <public/hvm/save.h>
 #include <asm/hvm/trace.h>
+#include <asm/xenoprof.h>
 
 enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
 
diff --git a/xen/arch/x86/oprofile/op_model_ppro.c b/xen/arch/x86/oprofile/op_model_ppro.c
index 847b063d12..90b5d2887a 100644
--- a/xen/arch/x86/oprofile/op_model_ppro.c
+++ b/xen/arch/x86/oprofile/op_model_ppro.c
@@ -121,7 +121,7 @@ static int ppro_check_ctrs(unsigned int const cpu,
 			{
 				if ( IS_ACTIVE(msrs_content[i].control) )
 				{
-					msrs_content[i].counter = (low | (unsigned long)high << 32);
+					msrs_content[i].counter = (low | (u64)high << 32);
 					if ( IS_ENABLE(msrs_content[i].control) )
 						ovf = 2;
 				}
diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h
index 3e318eba69..77086658f5 100644
--- a/xen/include/asm-x86/xenoprof.h
+++ b/xen/include/asm-x86/xenoprof.h
@@ -64,6 +64,9 @@ void xenoprof_backtrace(
                  "xenoprof/x86 with autotranslated mode enabled"    \
                  "isn't supported yet\n");                          \
     } while (0)
+int passive_domain_do_rdmsr(struct cpu_user_regs *regs);
+int passive_domain_do_wrmsr(struct cpu_user_regs *regs);
+void passive_domain_destroy(struct vcpu *v);
 
 #endif /* __ASM_X86_XENOPROF_H__ */
 
diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h
index 3c0104e382..5616d0867f 100644
--- a/xen/include/xen/xenoprof.h
+++ b/xen/include/xen/xenoprof.h
@@ -75,7 +75,4 @@ int xenoprof_add_trace(struct domain *d, struct vcpu *v,
 int acquire_pmu_ownship(int pmu_ownership);
 void release_pmu_ownship(int pmu_ownership);
 
-int passive_domain_do_rdmsr(struct cpu_user_regs *regs);
-int passive_domain_do_wrmsr(struct cpu_user_regs *regs);
-void passive_domain_destroy(struct vcpu *v);
 #endif  /* __XEN__XENOPROF_H__ */